From: Marek Vasut Date: Tue, 8 Jan 2019 13:05:39 +0000 (+0100) Subject: rcar_gen3: plat: Rename H3 label X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=e0dd5bb8f7b1195e3cb75e8e44238d8ac2c4a895;p=project%2Fbcm63xx%2Fatf.git rcar_gen3: plat: Rename H3 label Rename the H3 label to avoid confusing clang, which generates an error if the label is just H3. Rename it to RCARH3. Signed-off-by: Marek Vasut --- diff --git a/plat/renesas/rcar/aarch64/plat_helpers.S b/plat/renesas/rcar/aarch64/plat_helpers.S index d40f8f2e..df1664d7 100644 --- a/plat/renesas/rcar/aarch64/plat_helpers.S +++ b/plat/renesas/rcar/aarch64/plat_helpers.S @@ -326,11 +326,11 @@ func plat_reset_handler ubfx w0, w0, 8, 8 /* H3? */ cmp w0, #0x4F - b.eq H3 + b.eq RCARH3 /* set R-Car M3/M3N */ mov x2, #1 b CHK_A5x -H3: +RCARH3: /* set R-Car H3 */ mov x2, #0 /* --------------------------------------------------------------------